Some win32 cleanups

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 18997ad0abdac092711146bd51a11fa139cfe0a4..8c0d026d7a0dc2ae86278d6a80e2a24e403fd9ff 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -1883,19 +1883,9 @@ _gdk_windowing_create_cairo_surface (GdkDrawable *drawable,
                                     gint width,
                                     gint height)
 {
-  GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
-  RECT rect;
-
   HDC hdc = _gdk_win32_drawable_acquire_dc (drawable);
   if (!hdc)
-    {
-      return NULL;
-    }
-
-  GetClipBox (hdc, &rect);
-  g_print ("create_cairo_surface(): [%d %d %d %d]\n",
-          rect.left, rect.top, rect.right, rect.bottom);
-
+    return NULL;
   return cairo_win32_surface_create (hdc);
 }
 
@@ -1939,7 +1929,6 @@ _gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
                                       gint height)
 {
   // Do nothing.  The surface size is determined by the DC
-  g_print ("*** set_cairo_surface_size()\n");
 }
 
 static gint

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index c919f60b8e460aac93e972f795afeb12d4ba639a..38ad79c9fb1d7e5018b3f810924387ba0b4cfa2d 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1557,29 +1557,6 @@ handle_wm_paint (MSG        *msg,
 
   EndPaint (msg->hwnd, &paintstruct);
 
-  /* HB: don't generate GDK_EXPOSE events for InputOnly
-   * windows -> backing store now works!
-   */
-  if (((GdkWindowObject *) window)->input_only)
-    {
-      DeleteObject (hrgn);
-      return;
-    }
-
-  if (!(((GdkWindowObject *) window)->event_mask & GDK_EXPOSURE_MASK))
-    {
-      GDK_NOTE (EVENTS, g_print (" (ignored)"));
-      DeleteObject (hrgn);
-      return;
-    }
-
-#if 0 /* we need to process exposes even with GDK_NO_BG
-   * Otherwise The GIMP canvas update is broken ....
-   */
-  if (((GdkWindowObject *) window)->bg_pixmap == GDK_NO_BG)
-    break;
-#endif
-
   if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left) ||
       (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
     {
@@ -1621,12 +1598,8 @@ handle_wm_paint (MSG        *msg,
     }
 
   update_region = _gdk_win32_hrgn_to_region (hrgn);
-
-
-  //_gdk_win32_windowing_window_get_offsets (window, &xoffset, &yoffset);
-  //gdk_region_offset (update_region, xoffset, yoffset);
-
-  _gdk_window_process_expose (window, update_region);
+  if (!gdk_region_empty (update_region))
+    _gdk_window_invalidate_for_expose (window, update_region);
   gdk_region_destroy (update_region);
 
   DeleteObject (hrgn);

diff --git a/gdk/win32/gdkgeometry-win32.c b/gdk/win32/gdkgeometry-win32.c
index 833fc5b625cc6d77cda77209012e26f656c2d005..fb2b363b1459faaf3e8086ec6784fa3b7a3980df 100644 (file)
--- a/gdk/win32/gdkgeometry-win32.c
+++ b/gdk/win32/gdkgeometry-win32.c
@@ -114,26 +114,6 @@ _gdk_window_move_resize_child (GdkWindow *window,
   _gdk_win32_window_tmp_reset_bg (window, TRUE);
 }
 
-void
-_gdk_window_process_expose (GdkWindow *window,
-                           GdkRegion *invalidate_region)
-{
-  GdkWindowImplWin32 *impl;
-  //GdkRegion *clip_region;
-  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
-  
-  GDK_NOTE (EVENTS, g_print ("_gdk_window_process_expose: %p %s\n",
-                            GDK_WINDOW_HWND (window),
-                            _gdk_win32_gdkregion_to_string (invalidate_region)));
-
-  if (!gdk_region_empty (invalidate_region))
-    _gdk_window_invalidate_for_expose (window, invalidate_region);
-  else
-    g_print ("process_expose(), empty region\n");
-  
-  //gdk_region_destroy (invalidate_region);
-}
-
 void
 _gdk_win32_window_tmp_unset_bg (GdkWindow *window,
                                gboolean recurse)

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 84284a86a506f5de3ccbb5714459767ac82f12c7..edd1e069f851eb27944cce5c2327628a7443e1b1 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -234,9 +234,6 @@ void _gdk_win32_windowing_window_get_offsets (GdkWindow *window,
                                              gint      *y_offset);
 
 
-void _gdk_window_process_expose    (GdkWindow *window,
-                                    GdkRegion *invalidate_region);
-
 void _gdk_win32_selection_init (void);
 void _gdk_win32_dnd_exit (void);
 

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 96f89e8358d43c6106c4b413b489b2973f38f7af..894b07041d86881bcfc8fa1b6704862408c232e8 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -3609,6 +3609,7 @@ _gdk_win32_window_queue_translation (GdkWindow *window,
                                     gint       dx,
                                     gint       dy)
 {
+  /* TODO: Get current updateregion, move any part of it that intersects area by dx,dy */
   g_print ("queue_translation\n");
 }